Auto merge of #2061 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 21 Oct 2015 20:59:56 +0000 (20:59 +0000)
committerbors <bors@rust-lang.org>
Wed, 21 Oct 2015 20:59:56 +0000 (20:59 +0000)
* Move along the same rails for all dependencies, picking up various small perf,
  build, and portability improvements.
* Update pinned rustc to pick up perf improvements and such
* Tweak expected error message from tests to continue to work


Trivial merge